Accelerate fitting further [see PR#330] by building eval-string only once in a fit#331
Open
adrianusler wants to merge 4 commits into
Open
Accelerate fitting further [see PR#330] by building eval-string only once in a fit#331adrianusler wants to merge 4 commits into
adrianusler wants to merge 4 commits into
Conversation
|
I reproduced the lint failure from the current CI run. It is only formatting: This minimal patch fixes it: diff --git a/impedance/models/circuits/circuits.py b/impedance/models/circuits/circuits.py
@@
if self._is_fit() and not use_initial:
arg_dict.update({"parameters": self.parameters_})
eval_str, index = buildCircuit(self.circuit, frequencies,
- *self.parameters_,
- constants=self.constants, eval_string='',
- index=0)
+ *self.parameters_,
+ constants=self.constants,
+ eval_string='', index=0)
@@
warnings.warn("Simulating circuit based on initial parameters")
arg_dict.update({"parameters": self.initial_guess})
eval_str, index = buildCircuit(self.circuit, frequencies,
- *self.initial_guess,
- constants=self.constants, eval_string='',
- index=0)
+ *self.initial_guess,
+ constants=self.constants,
+ eval_string='', index=0)
diff --git a/impedance/models/circuits/fitting.py b/impedance/models/circuits/fitting.py
@@
eval_str, _ = buildCircuit(circuit, frequencies, *parameters,
constants=constants, eval_string='',
index=0)
# maybe frequencies don't need to be passed as argument to buildCircuit
+
def wrappedCircuit(frequencies, *parameters):I verified locally with the same lint command: I cannot push to this PR branch from here because my permission on |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The circuit was parsed into an eval-string in every single function call during the fit iterations. I changed the code in a way that allowed me to take the eval-string build out of the function calls. Compared to the performance of PR#330, this leads to a further acceleration by a factor ~2 (i.e. together they accelerate fitting by a factor ~10).
This PR builds upon the branch of PR #330, so that one should be merged before this one.